Merge pull request #2 from rangerofthewest/master

Mergetime
Merge pull request #3 from rangerofthewest/bad-news

Merge pull request #2 from rangerofthewest/master