Fix #39
Merge branch 'dev' of github.com:yomguy/TimeSide into dev