Merge pull request #7 from ChrisBoesch/master

update
Merge pull request #8 from ChrisBoesch/master

update
house keeping for DND and cleared console errors
Merge pull request #48 from LI-HE/master

house keeping for DND and cleared console errors