some minor changes
Master is better.  Merge branch 'master' of https://github.com/wolf29/sipper-bird