Merge pull request #5 from ldmco/dev

Dev
KSM[FIX]: Fix comments
Merge pull request #40 from Yoji/dev

Dev