Merge pull request #427 from antwebes/antwebes_development