Merge pull request #283 from dreamteam69/master

Version bump