merging in development
updates to spec and module per comments on PR