test4

Squashed commit of the following:

commit d9cf764d0feaba2fa5ab47c5626d6692593ffc8f
Author: Remol <remolremol@gmail.com>
Date:   Sun Jul 6 11:09:34 2014 +0200

    test rebased
test5
Merge branch 'tb3' of github.com:remol/test into tb3