links fix
images fix
Merge pull request #6 from razykov/porting-fixes

Porting fixes