code cleanup
Merge branch 'develop' of https://github.com/chrisseto/Archiver into develop