first week of work
Merge pull request #6 from aprilkw/master

first week of work