Merge pull request #1 from kyledrake/master

Update master