Fix #27
Testcase for #27
Merge pull request #28 from huntrax11/master

Fix #27