display F/M in stat branch Fixes #149
Merge branch 'dev'