Merge branch 'release/0.0.11'
trying to get tests to pass in travis-ci
Merge branch 'master' into develop