Replaced bundled code with using six

Fix issue #11