Merge PR 130 to fix SOCIAL-432