Fix bugs, add some features upon request
Merge branch 'master' of github.com:simsem/simsem