Merge pull request #5 from roacobb/master

Updates
Merge pull request #6 from roacobb/devel

Merge pull request #5 from roacobb/master