small changes
Merge branch 'master' into afalsario
Merge pull request #37 from afalsario/afalsario

Afalsario
conflicts resolved