some improvements. not sure what
Merge branch 'master' of github.com:dcherian/eddyshelf