Merge pull request #2 from eltados/master

Merge up