refactors
refactors, changed time to microtime
Merge origin/master