Continued work on timepicker
Merge remote-tracking branch 'origin/master'