Emanuel

Resolved issues of last pull request.