Implemented point loading into controller
Merge origin/master