tests green
refactoring
fixes. new tests
comments
Merge pull request #5 from ololyay/naming

Naming