#16 few changes to documentation and fixes as per test cases.