Update to v1.0.5
Merge branch 'dev'