rebased from master
Merge pull request #25 from xxSandiLLyxx/skills_on_splash

rebased from master