Merge pull request #1 from mvala/master

Added cpu and memory monitoring