Changed: Collapse two if statements
Changed: Auto include Metrics
Restructued: pom.xml
Changed [testing]: Use defaultCharset
Fixed: obsolete code