Merge pull request #2 from pbattaglia/develop

Develop
Merge pull request #6 from pbattaglia/develop

Develop
Merge pull request #8 from pbattaglia/master

Master