allow memory and swap resource types
Merge pull request #29 from mancdaz/master

Merged automatically by jenkins after successful build test