tomjakubowski Merge pull request #68 from ddacunha/master …