Version 3.0

Version 3.0 (24/6/14) => Fixes on the code , corrected some mistakes!