Merge pull request #110 from pocesar/master

Two tickets
Merge pull request #111 from pocesar/master

Sub / Sup / Del / Strike