Merge pull request #79 from jeandersonbc/issue78