CHANGES FROM ISSUE 53 BRANCH
MERGE FIX