init
Merge pull request #1 from mco14/edit1

init