Merge pull request #5 from majuss/master

pull from remote
added 0xED
typo
Merge pull request #6 from baslr/patch-1

Patch 1
Merge pull request #8 from baslr/master

pull from remote