Merge pull request #2 from thongthong/master

Merge pull request #1 from thongthong/noodle4