Removing rounding
Testing more accurate time measurements
Cleaned up
Merge branch 'develop'