issues #118, #103, #140, new version