small fixes
Merge pull request #86 from andreywix/Feature-PolishingUp

Feature: Polishing Up