Added write capabilities
Merge develop