Performance and logging improvements.#663

bnouwt merged 2 commits intomasterTNO/knowledge-engine:masterfrom

performance-and-logging-improvementsTNO/knowledge-engine:performance-and-logging-improvementsCopy head branch name to clipboard