Justin's Changes
merge conflics from github
merge jdavid github