Merge pull request #4 from orivej/master

Do not qualify internal symbols.
Removed "initialize-instance :after uri"