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

commit 05048fb496a4879ab706f36137ad6d301f661736
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Tue Mar 11 19:54:06 2014 +0100

    hm, i wonder how this could ever have worked

monomelodies/monad,monomelodies/monad