Merge branch 'hotfix/0.3.3'
Tests fail if not initialzed as a git flow repo.
Merge branch 'hotfix/0.3.4' into develop

Conflicts:
	pom.xml