Merge pull request #3 from mcginley561/develop

Added a newer feature
Added a wicked new feature
Fixed bug in Pat's latest feature

It's now awesome!