Fixed 17 -- Added support for Python 2.7