Final Updates

Yea!
Merge pull request #8 from anayadesign/master

Final Updates