Some fixes for Python 2.6
Merge pull request #16 from SyamGadde/develop

Some fixes for Python 2.6