Ttipia: closes #20
updated