Merge pull request #1 from nhondong/master

Commits by Nils (nhondong)