Merge pull request #6 from EmilS/master

Maven Repo + Minor Changes to Main File  + Unit Tests