Initial version added
Added new testcases and bug fixes