Merge pull request #48 from raphj/algoo