Resolve #116
Merge pull request #121 from robertatakenaka/mkp116

Resolve #116