working on #222
merge resolved #222