Merge pull request #479 from timschofield/develop

Fetch defaults if no value sent
Minor code formatting changes
Merge pull request #480 from fahadhatib/develop

Minor code formatting changes