Refactoring and bug fix
remove dll and pdb
Merge remote-tracking branch 'origin/master'