port
Merge pull request #1 from crommix/master

set it