Merge pull request #131 from bryan-m-hughes/master

Quick bug fix