Merge pull request #549 from rkunze/sispmctl