Updated conflicts
Merge pull request #90 from alim/Issue_76_Foundation_Joe

Updated conflicts