Merge pull request #1 from eltados/master

Merge up