bumped version
fixed six dependency
Merge branch '1.2.X'