Merge pull request #7 from JordanRL/dev

fixed bug in laps and added desc to profiler
Merge branch 'master' into dev