Fixes #18. Thanks for the idea @pfaffman!