Some adjustments
Merge branch 'master' of github.com:vishwin/coffeestop