Profiler improvements
Merge pull request #98 from martiis/profiler_improve

Profiler improvements