Merge branch 'hotfix/0.2'
Hot fix
Merge branch 'hotfix/0.0.3' into develop

Conflicts:
	classes/Test.php