working on #54
merge conflict resolved