Updated comments (version 2.0.1) and new test cases for new features.