Merge pull request #1 from testmarou/master