Fixed calculateFlex
Merge branch 'master' of https://github.com/ohlmar/timereport