Fixing some stuff, making HumanTime better
Merge remote-tracking branch 'origin/master'