Squashed commit of the following:
Squashed commit of the following:

commit 4045b8c689d35170675b5d26c4809b9c9bf9b2a2
Author: Stefan Zweifel <hello@stefanzweifel.io>
Date:   Sun May 24 10:01:07 2015 +0200

    Wording changes

stefanzweifel/imgubox,stefanzweifel/imgubox,stefanzweifel/imgubox