fix else timepad
Merge branch 'develop'