Merge pull request #1 from FlaminSarge/master

Updates and fixes, for 0x0A