Solving merge conflicts and pushing the changes
Merge pull request #2 from fashiontec/Story17

Please merge the changes