Merge branch 'master' into dev
Update to v1.0.6
Merge branch 'dev'