Merge pull request #24 from rangerofthewest/master

Catching Bad-news Up
Merge pull request #26 from rangerofthewest/bad-news

Merge pull request #24 from rangerofthewest/master