added some enhancements
Merge pull request #1 from thinkaliker/master

added some enhancements