Tweaking model and app
Merge branch 'master' of github.com:Gregwar/Plankton