fixes #112

fixed 112 and changed some javadoc