Data creation
Merge branch 'master' into data_handler
Merge branch 'data_handler' of github.com:germanchocolate/Chillin