A third pull request






<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable-dev-piotr.firebaseapp.com/reviews/pkaminski/-foo.bar-this-that-/3)
<!-- Reviewable:end -->