Vadim

[PR-2] Merged splashes into master