Merge pull request #1 from xmppjingle/master

merge from origin
fix tests
Merge pull request #4 from bosqueviejo/master

Fix eunit tests