Fix #5
Merge branch 'TRY-KOS-5' into INC-0.2.3