refs #32
Merge branch 'master' into #32
Merge branch 'master' into #32

Conflicts:
	pom.xml
Merge pull request #44 from cinovo/#32

fixes #32