Updating with UCSB code + my fixes
Merge branch 'master' of github.com:lsuits/quick_edit