More tests
Merge branch 'master' into 1.0.0

Conflicts:
	src/main/java/Test/App.java