More tweaking
Merge pull request #18 from serg-kakurin/master

More tweaking