Merge pull request #115 from remicollet/issue-awesome