Merge branch 'allizom'
Merge branch 'allizom'
remove comma
Merge branch 'dev' into allizom
Merge branch 'allizom'
add docs
more docs