File for new feature.
Merge branch 'master' into new_feature
Merge branch 'master' into new_feature
Merge pull request #4 from genghisjahn/new_feature

New feature