Merge pull request #3 from AlexanderKurtz/master

Pull request for all the remaining patches, including the new performance monitors.