Merge pull request #1 from chyld/master

Update