Merge pull request #16 from HUSACCT/develop

Construction 3 merge 2
Merge remote-tracking branch 'origin/develop'