Merge pull request #49 from jpcardona/master

sc