Merge pull request #2 from larzw/iss53

Iss53
t
Merge branch 'master' into iss53