Merge pull request #129 from khoa-nd/master

Merged
Merge commit 'bb3fdac788751a02a5c31523138ab738f0879305'