enhancements
Merge pull request #15 from kenshoo/some-enhancements

enhancements