Merge pull request #26 from NDDev/master

update