fixing some pythonic stuff
Merge pull request #1 from eeue56/master

fixing some pythonic stuff