Fix typo
Fix test cases
Merge pull request #82 from id774/issue70

Fix typo and test cases