Add maven plugin and Finish the JUnit test
Merge remote-tracking branch 'origin/master'