Fixed: Issue 471 - Improved X10 supports, thanks to TechNovation for the code