deliverable one

latest versions
Merge pull request #59 from nickcabral/master

Deliverable One