Merge pull request #8 from yhwh/development

Development
Merge pull request #9 from yhwh/development

Development
Merge branch 'master' of github.com:yhwh/stimuli into development