Merge branch 'release/v0.12' into develop
Merge branch 'master' into develop
Fixing nav
Version bump to 0.1.3
Merge branch 'release/v0.1.3'