Fixed issue 163 and another unknown issue. Added unit test for it.
Merge branch 'master' of github.com:larsga/Duke