Merge pull request #48 from painless-security/jennifer/monitoring