fixed #34
added a test for issue #35 which was fixed long time ago