Added main function
merge fix
fixed merge conflict
python3!
Merge pull request #1 from yanivolivero/master

This is a nice fix