nw added
Merge pull request #12 from mathurricha/master

conflict chck