Merge pull request #19 from 0nebit/master

Chris/Chuan partial JUnit