Merge pull request #103 from hazendaz/master

Maven / General Cleanup