Merge pull request #12 from kittylyst/master

Ex 8
Merge pull request #13 from kittylyst/master

Fix test case
Merge pull request #14 from kittylyst/master

Test case fix