closes #22 (add heise mac+i)