New Patch For Issue #4

There is some upgrade that i did in the code (oneliner and comprehension list).
Still helpfull if you want them.

Happy to help.