Cleaned up metertools.
Merged master.