feature 1 implementation
Merge branch 'master' into feature1
Merge pull request #1 from mxieGit/feature1

Feature1 confirmed merge to master