Merge pull request #65 from jeandersonbc/issue64