Vlad's changes
Merge pull request #1 from yummyhead/vlad

Vlad's changes