refs #51 - waiting for api release
Merge branch 'master' into 51

Conflicts:
	pom.xml
Merge pull request #58 from cinovo/51

51