Final touch! BUG FIXED!

Finally, everything has been fixed and release 2 is ready. Have happy
and safe times with it. :D