Merge pull request #54 from leiradel/master