[feature] Integrated Donna's changes
Merge pull request #1 from alex-deaconu/master

[feature] Integrated Donna's changes