Fixed export lists

Closes #52