Update to 1_7_R4
Merge pull request #3 from lifehome/patch-1

Update to 1_7_R4