Merge pull request #1 from wisesmile/master

This is a test
Merge branch 'master' into develop
initial commits