added guard
Merge branch 'IlwisCore/master'
disbaled threading for the moment