refactoring
Fixes #142 and #143
javadoc
version string
removed deprecated method
Implements #145

added two parameters
javadoc fix