very useful changes
Merge pull request #1 from henneken/awesome_feature

very useful changes