Bug fix
Merge pull request #1 from carlosgs/master

Bug fix
Merge pull request #2 from ve3sjk/master

update