fixed #3
fixed #5
fixed #4
fixed #2
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
merged