Merge remote-tracking branch 'upstream/master' into cleanup
Coding standards
Merge pull request #45 from dennisdegreef/cleanup

Coding standards