Merges 'hotfix-0.2.1'
Merge bug fixes #1 #3