Improved style in the beginning
Right class
Merge pull request #103 from Gaya/improved-tests

Improved tests