work in progress
Merge branch 'IlwisCore/master'