i am god
Merge pull request #1608 from theflyingstone/theflyingstone

Merging PR from @theflyingstone