testing travis, sigh
Merge branch 'release/0.0.1-testing'