Add Diaspora support
merge