Fixed little bug
added test
Modifications for style cop