Fix "Fatal error: Using $this when not in object context"
Merge pull request #1 from tanz-sullamora/master

Fix "Fatal error: Using $this when not in object context"