My changes that didn't work last night.
Merge pull request #26 from JarredO/master

My changes that didn't work last night.