refactoring wip
adding --add flag
wip fix
initial functional tests
refactor functional tests
fix #8, use `six>=1.8.0`