Merge pull request #2 from 23edson/master

up5