Merge pull request #25 from bostak/Samuel

Widget & profiler