Merge pull request #86 from 4950/god

God