Merge pull request #1 from JRebirth/master

checkin