resolves #29: replace tutorial implementation