Working toward py3, this works on 2.6 and 2.7...