Changed conditions, added loop
Merge branch 'master' of https://github.com/dazey3/ARPS