Merge pull request #320 from 4950/god

God