Merge branch 'hotfix/0.1'
Merge branch 'release/0.1'

Conflicts:
	classes/Test.php
I missed the !
Merge branch 'hotfix/0.2' into develop

Conflicts:
	classes/Test.php