issue 772 update
issue 645
Merge pull request #975 from NadavSch/issue_772_update

Issue 772 update