Merge pull request #225 from rjmartell/master

Suggested fix for issue 214