Issue141 arkenoi

Replaces #142 and pass the Travis check now...