fixing a bug from a merge with user stories branch
fixing another bug from the merge from user stories to master