bump version
Merge remote-tracking branch 'upstream/master'
fix build problems
Merge pull request #565 from patriot1burke/master

build problem fixes