trenner
committed
on 15 May
improve input validation