Add test for issue 54
Merge pull request #56 from mroderick/issue-54

Add test for issue 54