several fixes
Merge branch 'master' of github.com:pidgeonproject/pidgeon