0.0.3
Version bump
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml