Merge pull request #121 from m6w6/issue-120