Merge branch 'master' of github.com:flyingrub/scdl