Bugfixes
Merge pull request #1 from zmactep/vladimir-changes

Bugfixes