small merge
Merge pull request #16 from chelseakomlo/james

small merge