l-kramer Merge pull request #94 from rejectedsoftware/dip-1000