Merge pull request #24 from rangerofthewest/master

Catching Bad-news Up