Merge pull request #1 from JerryZendy/master

Pull1