Merge pull request #1 from aldee/master

Update