Temporary fix to time values
Removed tempary clock variables
Merge branch 'master' of github.com:cnm/mia_vita