Merge pull request #1 from ofridagan/master

Some things I found while reading the code...
Merge remote-tracking branch 'kris/master'
Merge branch 'master' into playing