Merge pull request #9 from JonathanO/master

Correct bugs with proxy generation and scope.