fix recursion problems
Merge branch 'master' of github.com:jalehman/rmcp