Merge pull request #30 from rangerofthewest/master

Merge with master
Merge pull request #32 from rangerofthewest/bad-news

Merge pull request #30 from rangerofthewest/master