Merge pull request #2 from warhog/master

some minor enhancements