first changes for feature
Merge pull request #1 from mobbren/feature

This is a pull request!