first commit
Merge https://github.com/fadonic/aric