Re-written
Merge branch 'master' of github.com:AdamskiFTW/arc