Merge branch 'hotfix/0.1.2a'
Merge branch 'develop'
ran cargo update to fix deps
Merge branch 'hotfix/0.1.4' into develop