sync for Usman
Merge branch 'master' of github.com:marcua/chrono
test almost doesn't fail
Merge remote-tracking branch 'upstream/master'