Merge pull request #1 from asciidisco/master

Merge