Changed error message
Changed option name
Merge pull request #3 from iainrb/devel

Merge changes for release 0.1.2