Merge pull request #20 from finder39/Beta5

Update for Beta5