Merge pull request #1 from jfmorcillo/master

Merge samba4