Merged with Fr330wn4g3's changes