Added timer functions and program argument support
Fixed merge conflicts with changes branch