traits and interfaces
Merge branch 'develop' of https://github.com/cfralick/granada into develop