Merge pull request #20 from jerv13/master

Update code standards