Merge pull request #160 on CEWendel's repository by CrowdTunes/master