hfiref0x Merge pull request #33 from hfiref0x/dev115