Timer implementation cleaned and improved
Machin2 implemented + all code revised