Fixes the bug referenced in #160, but does not address the larger feature work referenced by the issue.
Niklas Anderson