24.10.2013(refactoring)
Merge pull request #8 from Andrey-Tsirkun/branch-24.10.2013

24.10.2013(refactoring)