Configure project
Merge pull request #1 from altirnao/feature/SP-21

Configure project