Slight performance tweaks
Merge branch 'master' of https://github.com/wallstop/VMetrics