short circuiting fixed
more test cases
Merge pull request #11 from bingam/master

more test cases