Added some fixes / improvements
Fixed merge conflict
Merge pull request #5 from pure-python/Dumitrescu-Tiberiu-Alexandru

Added some fixes / improvements