Minor tweaks.
Merge pull request #2 from alexcouper/small_changes

Minor tweaks.