update
Merge branch 'master' of https://github.com/nickhar/dahling.js