fix issue 34
merge fix for issue #34