Merge pull request #1 from jondot/master

Merge updates