refactor and extend
Merge branch 'master' of github.com:ia97lies/xauxi