Issue #110 partially implemented
merge with tebo