suggestions fixed:
Merge branch 'suggestionsimplementationbranchding'