Added profiler features to master, using a 'profiler' query parameter, see #162