fix for issue 38
merge fix38
Merge branch 'fix38'