intermediate commit
Merge https://github.com/imangutov/HendricksFinal