Pull request do #3

Zamyka ticket #3