Merge pull request #14 from NDDev/master

update jim #1
Merge pull request #27 from NDDev/master

update
Merge pull request #33 from NDOrg/jim1

Jim1