filled out list
Merge pull request #3 from manzalena/master

filled out list