Added jUnit testing
Merge origin/master