Merging develop to master

Redundant `self` detected.