cc
fixes #74
working on #73