#28 - Some issues on Leon but the main target is solved.
Sorry for the mess - #28 with issues on Leon