Merge pull request #125 from khoa-nd/master

Merged