Merge "Added getMessage() method"