Added timezone information to some of the times
Merge branch 'master' of https://github.com/nichol77/aware