Finished speed test feature
Merge branch 'master' into javier