fixes #26
fixes #20
Merge branch 'master' of https://github.com/Ephys/TinkersSteelworks