Moving to maven
Correcting test
Correcting unit tests
Merge pull request #134 from chdemko/master

Moving to maven