Merge pull request #1 from wbond/master

Merge the update