Extra defensive code in public export - Not sure whats going on here
Merge branch 'test' of github.com:k-int/KBPlus into test