Clip upper to avoid list index out of range
Merge branch 'master' of https://github.com/akovacs/cs224w