merged latest markov from jocke-l/markov:master