Fixed bug with full submit
Merge pull request #425 from johnnykahalawai/integration

Fixes bug with full submit.
Merge remote-tracking branch 'upstream/master'