Merge pull request #375 from 4950/god

God