Merge pull request #1 from hmakauskas/master

merged oficial
Change 555 Educa
Merge branch 'Rbsba-master'
Merge files