- fixed issue 338 (resolve issue: resolution=RESOLVED status=Fixed)

- fixed issue 341 (resolve issue: resolution=RESOLVED status=Fixed)
- fixed issue 351 (resolve issue: resolution=RESOLVED status=Fixed)
- fixed issue 359 (resolve issue: resolution=RESOLVED status=Fixed)