HACK fix client path joining
Fix rename fail
Shit, I'm not even testing that.
Merge pull request #293 from Hoikas/trolling

Fix bugs
Merge remote-tracking branch 'huru/master'