issue-375 issue_376 master v.0.3.0