Merge pull request #1 from freedomgames/master

Merging in current code