updates
Merge https://github.com/nikmaniatis/playground