bumps version
Merge remote-tracking branch 'upstream/master' into bump_version
Merge pull request #4 from ctaintor/bump_version

Bump version