code update
Merge pull request #2 from ddenhart/dd-141118

code update