Removed unqanted jUnit test added some javadoc
Merge origin/master