Version bump following the merge of #35.
Merge branch 'master' into travis_unit_tests