Feature/auto aim

PULL ME NAO (#100)