Merge pull request #307 from 4950/god

God