Issue #16 describes the problem and solution perfectly.

Updated tests to cover this.

Fixes #16