Merge pull request #1 from dhennessy/master

Updated