prepare v1.1
Merge pull request #1 from espencer/develop

prepare v1.1