Merge pull request #43 from tabosque/master

Merge into develop