finalize
Merge pull request #1074 from Tendrid/develop

finalize