Merge pull request #1607 from reaperhulk/add-der-keys

Add DER keys