major update
Merge pull request #1 from shanawho/master

major update