Imports corected to work correcty on python 2.7 on Eclipse
Improveents in handling multiline comments