added placeholder
Merge branch 'dev' of github.com:himerzi/magenta into dev