86e90c5 Merge pull request #1 from sheldonled/master