jonsterling Merge pull request #253 from jonsterling/fix-bug …