Merge pull request #116 from franciscod/pacman