tested working on client
Merge branch 'master' of github.com:coolaj86/cell-fox