Updated some lua functions
Updated lua functions
Updated lua functions
Merge remote-tracking branch 'origin/devel' into locations