Merge pull request #76 from SJossy/Testbranch

switch to call conversion fix