tests attributes
green tests
done
comments
some refactoring
useless code removed
style fixes
Merge pull request #7 from ololyay/naming

Naming