Merge pull request #1 from Pingendo/master