On behalf on Francis and Simon
Merge pull request #16 from lkarapetyan/test

On behalf on Francis and Simon: Web part