Merge pull request #43 from tabosque/master

Merge into develop
Merge pull request #44 from tabosque/develop

Merge pull request #43 from tabosque/master