Merge pull request #49 from jpcardona/master

sc
Merge pull request #50 from jpcardona/rivhy

Merge pull request #49 from jpcardona/master