Patch V.0.9.9.6
Merge pull request #40 from JanHorak/KeySaver31

Patch V.0.9.9.6