Some small changes to polish a few things up.
Merge pull request #285 from Jedwondle/master

Some small changes to polish a few things up.