Implemented ability to specify source for counter or gauge
Fix minor formatting issue
Merge branch 'maxd-master'