Merge pull request #18 from olegofsky/master

for team play
Merge pull request #19 from olegofsky/master

for team play. fix
#17 initial