Merge pull request #54 from eloicaso/master