Added =NULL to message handler
Just some formatting
Adjusted spacing
Using namespace wrapper vs prefixes for consistency with OS X template