Merge pull request #821 from narfbg/develop-profiler

Improve the Profiler library