karasu Merge pull request #177 from mpetitjean/master