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

commit 229d46c206bcdd1a56c52dad8ba3a99b5e1aaa9f
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Sun Mar 16 14:15:49 2014 +0100

    handle this better

monomelodies/monad,monomelodies/monad