Merge pull request #8 from kasperisager/develop

Version 0.0.1-dev
Merge pull request #11 from kasperisager/develop

Version 0.0.2-dev
Bump version
Github/Bitbucket sync
Consistent use of braces in conditionals