Sprint 1 Bug Fix
Merge branch 'Sprint1BugBranch'