Merge pull request #44 from jltallon/issue41