minutes to hour
Merge branch 'minor_fixes'