Minor cleanup
Merge pull request #1 from krockot/master

Minor cleanup