pull sladeware:master updates into etheon's fork