Fool mistake
Fixed little changes
added api point
Merged from @naoisegolden