Making syntax compatible with python 2.5
Merge pull request #6 from gregmuellegger/a8e857f01c46f3ca490bc5ced093c1eedd020d9d

Python 2.5 compatibility.
Python 3 compatibility
Merge pull request #10 from dominicrodger/master

Python 3 compatibility
Merge develop with master after I accidentally merged a PR into master