merge from https://github.com/TinyExplosions/app-template