WOrkin on the codes
Merge pull request #765 from ahomatthew/develop

WOrkin on the codes