Added changes from meeting
Merge pull request #6 from pmaldonado/master

Added changes from meeting