Clock in fixes
Merge branch 'dev' of https://github.com/azurinfotech/timesol into dev