Merge pull request #36 from NDOrg/master

update dev