Commit 2

By  Sergiu, second commit.