Replaced bundled code with using six

Fix issue #11 
It's fine, I'll leave it. The link should divide enough context if you are curious. Thank!