Add doxygen notes
Add doxygen notes
Merge branch 'master' of https://github.com/crust/freddy
Merge branch 'hacking'