Finishing touches
Merge pull request #11 from serg-kakurin/master

Finishing touches