Merge pull request #87 from amyagi/master

Updating with the file provided by Alan.