removed checkstyle warning
Merge branch 'feature/iss9' into develop

Conflicts:
	pom.xml