Ektorp

Addresses #42