-Bug fixed
-New functions added