issue B files added
Merge branch 'issueB' into development
START OVER