Small improvements...
Merge pull request #11 from SlavaRa/Refactoring

Small improvements...