Tweaking things.
Merge pull request #5 from gkadillak/garrett-branch

Tweaking things.