Merge pull request #42 from vikramrajkumar/master

Merge latest DNS codebase