Fixed timepicker
Merge pull request #262 from rashidkpc/master

Fixed timepicker