Merge pull request #98 from jeandersonbc/master