merge master with Issue 56

Mergeando mejoras