Bugfix #27
Merge pull request #28 from daitel/task_27_daitel

Bugfix #27