Merge pull request #18 from rangerofthewest/master

Merge Bad-news
Merge pull request #22 from rangerofthewest/bad-news

Merge pull request #18 from rangerofthewest/master