Merge pull request #1 from tinymoo/master

merge v1.1