Merge pull request #2 from amrox/master

Back merging master
Merge branch 'release/0.1.4' into develop
Merge branch 'develop' of github.com:amrox/fox into develop
Merge branch 'master' into develop
Bumping version
Merge branch 'release/0.1.5'