fix #659
Merge branch 'master' into fix_659
Merge pull request #660 from szelga/fix_659

fix #659