Merge pull request #356 from GMTA/develop