Fixed bug with forgotten $this ( fixing issue #1 ).
Merge branch 'hotfix-1.1' into develop