Created by: jfhbrook
Refer to issue #117 (closed) . This doesn't fix the issue, but it takes care of the low-hanging fruit.