More coolness
Merge pull request #1 from jstremick/master

More coolness