Merge pull request #704 from tensafefrogs/master

Comment out follow me option until it is implemented.