merged changes from codility
updated plugins