Merged Masni Bennett`s pull request