Merge branch 'sean-changes'
Merge branch 'master' into sean-changes
clean up