Mavenized
Minor cleanups, added junit dependency
Merge remote-tracking branch 'origin/master'