Merge pull request #58 from marcel-blonk/develop

Create and update data on the fly