Story 17
Fixed merge conflicts
Merge pull request #106 from buren/Story17

Story17