Merge pull request #20 from vlee90/andrew-branch

Andrew branch
updates