- Fixed issue mentioned on #284 (unable to instantiate class inside same class)
Merge remote-tracking branch 'upstream/master'