Should fix #38 and #39
Merge branch 'master' of github.com:sveale/remote-edit