mascarenhas Merge pull request #57 from rrthomas/master