Replaced bundled code with using six
Merge pull request #16 from hguemar/master

Replaced bundled code with using six