Final Fixes.

Sorry my fault.
Merge pull request #2 from IceColdJellyRom/jb-mr1

Final Fixes.