changes
Merge pull request #1 from cpgman/master

Modifications