Merge pull request #8 from Kreisfahrer/Evgenii

Evgenii
Merge remote-tracking branch 'origin/Evgenii'