fix issue #4
merge fix for issue #4