Merge pull request #58 from zelgerj/0.5.8-beta

Complete coding standard refactoring
test coding standard failure