Merge pull request #1 from chibenwa/master