Add more functions, make a cleaner script / Up to version 2.0.0