Fixed bugs regarding decoding.
Removed old file.