Merge pull request #370 from 4950/god

God