Fix #29 and rename broadcast receiver