Fixing some details
Merge pull request #1 from davbaumgartner/patch-1

Fixing some details