Second commit

Extended commit message https://trello.com/c/mebO7KoW