Merge pull request #86 from pradpnayak/GEP-50

Gep 50
GEP-53 Adding code to form layer from buildform
Merge pull request #87 from Edzelopez/GEP-53

GEP-53 Adding code to form layer from buildform
-- fixed strict warnings for GEP-58