Adding packages
Merge origin/master
Adding timer