Merge pull request #1 from 23edson/master

up5