Final Commit before submission

Signed-off-by: David Lee <David.Lee@Agsgeo.eu>