#37. All bugs and architectural issus were improved.
Merge pull request #38 from TikhomirovSergey/master

#37. All bugs and architectural issus were improved.