Resolve "Feedback fixes"

Nikolai Arbuzov requested to merge 60-feedback-fixes into master

Closes #60 (closed)

Merge request reports