added code for calculation
merging 'feature/berechnung' into 'develop'