Merge pull request #171 from 4950/god

God