Merge pull request #2 from m13253/master

More Pythonic code & Python 2 / Python 3 full compatibility & PEP-8 styled format