Merge pull request #130 from khoa-nd/master

Merged