Merge pull request #1 from Nunnery/master

Adding Maven support