changes for merge
cleanup merge
Merge pull request #1 from deserted/diff-merge

changes for merge