Merge pull request #1 from Nunnery/master

Adding Maven support
Merge pull request #1 from Mammothskier/master

Merge pull request #1 from Nunnery/master