Changed from time.clock() to time.time()
Merge remote-tracking branch 'origin/master'