Merge pull request #37 from dustincannon/develop

Bump version to 1.1