Prepare for next development iteration
Merge remote-tracking branch 'origin/1.0.1'

Conflicts:
	pom.xml