CS fixes by ongr-strict-standard
Merge pull request #11 from linasmo/ongr_cs_fixes

CS fixes by ongr-strict-standard