Added parsing to receive messages controller
Merging fixed conflicts