fixing small bugs
fixing merge conflicts
Merge pull request #27 from afalsario/afalsario

Afalsario