New changeset.
Solves for issue #3 by @p
Solves for issue #2 by @elazar
New tests written to ensure #2 and #3 pass.