Readme
Removed old configuration
Better parameter checking to avoid null pointers
JavaDoc update