Merge pull request #4 from kakserpom/master

Sync with upstream
cosmetics
Merge pull request #148 from nehxby/master

cosmetics