Merge branch 'release/0.4.0' into develop
readme
Merge branch 'hotfix/0.4.10' into develop
-_-
Merge branch 'develop'

Conflicts:
	README.md
tests
merged