Small improvements...
Merge pull request #25 from SlavaRa/fixes

Small improvements...