Merge pull request #76 from SJossy/Testbranch

switch to call conversion fix
Merge pull request #7 from f3cuk/Testbranch

Merge pull request #76 from SJossy/Testbranch