Mavenized project, fixed a failing test
Merge pull request #1 from andreimusca/master

Mavenized project, fixed a failing test