Cleaning (part 2)
Merge pull request #20 from tmladenov/master

Cleaning (part 2)