Issue #5: Properly handle $this
Merge pull request #21 from soxofaan/issue-5-handle-this

Issue #5: Properly handle $this