Updated the code to work on Python 2.7 and 3.4.