Fix bugs
Fix bugss
Merge pull request #7 from LeoOnHack/newFunctions

New functions