Merge pull request #139 from 4950/god

God