Merge pull request #2 from aim42/master

Update