Internal commit
Bugfix on issue 18 and testCase for it