Suppot mondrianwifi & 1.8 Release & Clean Up