Fabio/specs sources

This PR supersedes #19. The commits of @netbe have been squashed and reworded.
Cool gotcha!