Added CWM support from N00by