Added failing unit test for issue #17
Merge remote-tracking branch 'origin/master' into Next-Version