fixed more problems
Merge branch 'master' of github.com:rbsdev/pusher