Merge pull request #36 from NDOrg/master

update dev
Merge pull request #40 from NDOrg/dev

Merge pull request #36 from NDOrg/master