Hotfix/timeamountfile

@dustismo : Ready for merge