Merge pull request #1 from tvdzwan/master

code update