Merge pull request #6 from lcolladotor/devel

Develpment updates