Merge pull request #327 from 4950/god

God