Merge pull request #27 from settinghead/master

Test metrics collection