Merge pull request #2 from friendica/master

Merge from main project