Randomness

Squashed commit of the following:

commit 40f892f743d8be271d5d625006104c4e449adf95
Author: Ferran Garriga <ferran.garriga@truphone.com>
Date:   Fri Apr 25 09:57:42 2014 +0100

    Randomness

commit 7ef95d1b041df6fb9353f9ac1183fc485d107785
Author: Ferran Garriga <ferran.garriga@truphone.com>
Date:   Fri Apr 25 09:56:42 2014 +0100

    Randomness

commit c71cd7901e4d38c3a9e8ade8b1a025313127e200
Author: Ferran Garriga <ferran.garriga@truphone.com>
Date:   Thu Apr 24 17:42:17 2014 +0100

    Work in progress