Fixed the 12-hour time issue
Merge branch 'master' of github_personal:mrmilosz/atomicity