Merge pull request #9 from remicollet/issue-ul