[Fix #101] Fixing branch issue_84

Merging commits from issue_84 branch