Merge pull request #18 from SGover/master

a
changes in Blocks and player
update
Merge pull request #19 from SGover/shahar

Shahar