Minor fixes.
Merge pull request #11 from gkadillak/garrett-branch

Minor fixes.