Merge pull request #5 from twotoasters/james-dev

James dev
Mavenization