changes
Merge pull request #263 from CosmoCMS/James

changes