Merge pull request #74 from jeandersonbc/issue56