Merge pull request #382 from cmfcmf/patch-1