merging pull request for issue #31, reving-up to 1.0.18