Incorporate classes for time measure, and fixes some errors related to exceptions
Merge branch 'time_classes' into develop