fixed scaldi integration problems
Merge pull request #1 from OlegIlyenko/master

Fixes