#420 fixed
#419 fixed
#368 fixed
352 fixed: typo