Implemented changes from main Purdue app (David...)
Merge remote-tracking branch 'origin/master'