Merge branch 'master' of https://github.com/Kapeli/Dash-User-Contributions