Simpler list.
Merging the (very small) changes from 0.2.1 into master.