Merge pull request #136 from sandsmark/sonnet