added an alternative timeformat @XXhYYmZZs
changed the prefix for 1h30m format to $ to avoid clash
Merge pull request #8 from kqr/master

added an alternative timeformat @XXhYYmZZs