Pretty time
Merge pull request #27 from lol768/master

Pretty time