Avillafiorita master

Fixes #11