Merge pull request #7 from bjames105/master

update kayla-branch