Try to fix clockpicker bug v2
Merge pull request #80 from madevr/madevr

Try to fix clockpicker bug v2