Merge pull request #4 from joeswhite/master

update master
Merge pull request #6 from joeswhite/beta

Merge pull request #4 from joeswhite/master