Making the commands actually work.
rebased onto 9a6a25b63c4463800ed37715f6f951a6152333fc
Pull-Request has been merged by asamalik
Making the commands actually work.