Merge pull request #153 from SantiMunin/master