Fix for python 3.5 - #16

Fix for python 3.5#16

ppwwyyxx wants to merge 2 commits into

andreif:masterandreif/codegen:masterfrom

ppwwyyxx:masterCopy head branch name to clipboard