updates
Merge branch 'master' of https://github.com/jimroh/sql-profiler
fix
conflict fix