Merge branch 'master' into develop
opened up the dependencies a little bit
Merge branch 'release/v0.1.3'