Merge branch 'feature/funcwrite'