Use list rather than set (Python 2.6 compatibility)
Merge pull request #197 from pj2/master

Use list rather than set (Python 2.6 compatibility)
Merge remote-tracking branch 'upstream/master'