Decoding work fixed
Merge pull request #22 from Alegend45/master

Good enough for now.