Fixed some bugss
Merge pull request #976 from ahomatthew/develop

Fixed some bugss