Implemented timer
Style changes.
Merge branch 'develop'