issue #173, #55, #170
merging