Commits from Piotr Zbyszynski added,