Bump version
Merge pull request #330 from chadlung/master

Bump version