Merge pull request #120 from ribalda/master