Change 27/09/2014

Code organized and added some functions