Removed Image, added a piece of Javadoc
Merge origin/master