Merge pull request #13 from a-detiste/master

sort time units