from slave branch
Merge pull request #1 from marienkov/slave1

from slave branch