Merge branch monad-comp onto master