Merge pull request #73 from Strigoides/list-stuff