Added server side timer
Merged master after server side timer