Merge pull request #4 from joeswhite/master

update master