Merge pull request #1 from urexrex/2

re