Merge pull request #36 from k3oni/dev

Dev
Python 3 compatible.