Merge pull request #49 from lemonsqueeze/dragon