Merge pull request #1 from greatfire/master

Merge greatfire:master