Merge pull request #1 from txiasummer/develop

Develop
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
new files