Minor improvements
More enhancements
Merge pull request #7 from kdop/master

Pull before merge