Merge pull request #46 from eleybourn/master

From Evan