Fixed some bugs from the previous commit. Also, only one pointer will show at a time.
Merge remote-tracking branch 'origin/master'

* origin/master:
  phil's addition

Ignored origin.
Fixed merge conflict