Merge pull request #2 from jhuriez/master

updates