Fix plans issue (wrong link in the api)
Merge remote-tracking branch 'origin/master'