Fabio/specs sources

This PR supersedes #19. The commits of @netbe have been squashed and reworded.
There is a stray `<` before that, but other than that it looks good. What is the reason of the the comment?