issue 53 fixes
Merge branch 'iss53'