Fixed forward reference issue (closes #64)
Add some more rules to tree walker (#61)