Merge pull request #1 from rvolz/master

Update