Try to fix clockpicker bug v3
Merge pull request #82 from madevr/madevr

Try to fix clockpicker bug v3
Merge pull request #83 from madevr/master

Try to fix clockpicker bug v3