Version 1.5.2 Updated

updated from Hotaru Master branch