Added test-case for Issue #36
Fixed Issue #36
Merge pull request #40 from iOSCowboy/Issue-36

Fix for Issue #36