Stable branch with testcases

Added comments to Merge #64