Tests, killed bugs & rock-n-roll
Merge pull request #28 from andreywix/Feature-Tests

Tests, killed bugs & rock-n-roll