Merge pull request #5 from eprogramming/master

Maven structure