Feature update from dev.
Merge branch 'hotfix-1.0.1'