Merge pull request #1 from DTVD/master

Update