Merge pull request #85 from johngatti/master

Update version numbers
Fix compile issue
Merge remote-tracking branch 'origin/master'