work on issue #243
Merge pull request #307 from dark-al/master

work on issue #243