Updated to follow coding standards
Merge pull request #1 from OS2web/master

Updated to follow coding standards