Merge pull request #29 from Gerry1135/kspexp
Merge pull request #29 from Gerry1135/kspexp

Merged various fixes by 'Padishar'.