Fix Python 2.6 compatibility
Replace two more flag arguments
Merge pull request #298 from jayme-github/python26-resub

Fix Python 2.6 compatibility