Merge pull request #1 from wshallum/master