Merge pull request #169 from jasobrown/1.1

ffs, the version number again