Merge pull request #5 from hazendaz/master

Upgraded to Maven Annotations