Updated code to comply with new ONGR standards
Merge remote-tracking branch 'upstream/master' into feature_prepare-code-for-ongr-standard
Merge pull request #10 from lauriis2/feature_prepare-code-for-ongr-standard

Prepare code for ONGR standard (Closes #7)