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

- fixed issue 322 (resolve issue: resolution=RESOLVED status=Done)