Moving is ok, shooting sucks
Shooting fixed (stupid prototypes)
Merge branch 'master' into gh-pages