Temporary fix to time shift issue
Merge branch 'master' of https://github.com/partyks/enroll-me