update grand refactor to latest master #44

Closed Kirimson closed 6 years ago