Merge pull request #39 from davidderiso/davidderiso

Davidderiso
Merge pull request #1 from rambl/davidderiso

Merge pull request #39 from davidderiso/davidderiso