(This should have been part of previous commit)
Merge branch 'master' of https://github.com/schallagit/csync