bump version
Merge remote-tracking branch 'upstream/master'
Merge pull request #481 from patriot1burke/master

bump version