Wip
Merge branch 'library' of github.com:pidgeonproject/pidgeon into library