Merge pull request #1 from kreft/master

Fix SimpleInhibition (fophilips)
Merge pull request #55 from roughhawkbit/master

Merge pull request #1 from kreft/master