Merge pull request #370 from jcmurray/master

Bugfix release 1.1.1