Fixed issue 120.
Added test for issue 120