* Tweaked what looks like a merge conflict.
Merge pull request #1 from trifthen/master

* Tweaked what looks like a merge conflict.