First revision
Merge branch 'master' of https://github.com/auspaul/zmadsync