Merge fixed example files from master into development branch