Merge pull request #69 from GreenZapdos/master