Fixing the messsssss
Merge pull request #39 from edsadr/fixing_mess

Fixing the messsssss