Refactored a bit
Merge branch 'master' of https://github.com/teake/arXiver