Merge pull request #18 from rangerofthewest/master

Merge Bad-news