Merge pull request #243 from huntergregory/compile-error-from-241

Merge pull request #243 from huntergregory/compile-error-from-241 #65