Updated to support PerfData and Travis CI