WORK IN PROGRESS
Merge branch 'IlwisCore/master'