Merge pull request #123 from 4950/god

God