Fixed issue #4 : Application shutdowns unexpectedly with 'ReferenceTable overflow'.
Merge branch 'hotfix/fix_for_issue_4'