Few changes in message polling and new makefile