Fixes

Merged Alexander Ivanov changes and fixed the suggestions of the owner of the project.