Merge pull request #630 from Grunthos/master

Pre-release bug fixes
Merge pull request #51 from eleybourn/master

Merge pull request #630 from Grunthos/master