slave comit
Merge pull request #1 from galixan/master

slave comit