Add changes from merge
Merge branch 'master' of https://github.com/Immortalsun/ClockWidget