Committing merge of brev_projekt with master