initial upload 2
Merge pull request #9 from cstclair/master

initial upload 2