Bug Fix

Manually merge pull request from Github issues
Merge branch 'master' of github.com:objectivehtml/FlipClock