Intermediate commit from laptop
Merge pull request #10 from delafuente/first_install

Intermediate commit from laptop