charo-m Merge pull request #1 from zmich/master