fix #107 + uncrustify
Merge branch 'master' into taFPS
Merge pull request #167 from Phonations/taFPS

fix #107 + uncrustify