Merge pull request #3 from viteke/master

improve time computing for milestones
fixes
fixes
fixes
Merge pull request #13 from p1tz/master

update