Merge branch 'py02-problem' into py02-problem-with-eclipse