Merged with Master
Fixed versions in pom and re-generated manifests
Merge pull request #100 from marcoNieddu/master

Minor modifications