Dcnewman merge

Merge svn repo with github