reference
Merge branch 'master' of ssh://github.com/pidgeonproject/pidgeon
Merge branch 'master' of ssh://github.com/pidgeonproject/pidgeon
some improvements