Merge pull request #75 from lujameva/develop

Merge of various pending commits