fixes #78
Merge branch 'master' of https://github.com/mprat/Terminus
fixes #51