Merge pull request #217 from trevorbernard/master

Test for issue #216