Merge pull request #9 from GunnJerkens/master

Fixing a time bug