Merge pull request #262 from Foxcool/master