updates
Merge pull request #4 from roacobb/devel

Merge pull request #3 from roacobb/master
Merge pull request #5 from roacobb/master

Updates