Consistent remoting
Merge pull request #67 from matelakat/fix-remoting

Consistent remoting