Pull request referente a issue #8