I hope, it is last commit. Tests added