Merge pull request #4 from jnf/jnf/prepare_for_release

Jnf/prepare for release
Merge branch 'master' into jnf/style