first week of work
Merge pull request #1 from englishandy/master

first week of work