auto merging
Merge pull request #2 from nikilster/new-feature

can we merge!???